fix: setting key safe_mode_extensions not exists
#3992
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
SychO9
reviewed
May 18, 2024
Comment on lines
38
to
51
| $safeModeExtensions = json_decode($event->settings['safe_mode_extensions'] ?? '[]', true); | ||
| $sorted = []; | ||
|
|
||
| $extensions = $this->extensions->getExtensions()->filter(function ($extension) use ($safeModeExtensions) { | ||
| return in_array($extension->getId(), $safeModeExtensions); | ||
| }); | ||
| if ($safeModeExtensions) { | ||
| $extensions = $this->extensions->getExtensions()->filter(function ($extension) use ($safeModeExtensions) { | ||
| return in_array($extension->getId(), $safeModeExtensions); | ||
| }); | ||
|
|
||
| $sorted = array_map(fn (Extension $e) => $e->getId(), $this->extensions->sortDependencies($extensions->all())); | ||
| $sorted = array_map(fn (Extension $e) => $e->getId(), $this->extensions->sortDependencies($extensions->all())); | ||
| $sorted = array_values($sorted); | ||
| } | ||
|
|
||
| $event->settings['safe_mode_extensions'] = json_encode(array_values($sorted)); | ||
| $event->settings['safe_mode_extensions'] = json_encode($sorted); | ||
| } |
There was a problem hiding this comment.
does this part throw an error like the config one? I would assume it wouldn't since we do $event->settings['safe_mode_extensions'] ?? '[]' here 🤔
There was a problem hiding this comment.
safe_mode_extensions always includes in Saving event with empty value (safe_mode_extensions : "" in the Advanced page, so it doesn't cause errors here
There was a problem hiding this comment.
It may looks like this
// $event->settings['safe_mode_extensions'] is '' if no extensions selected
$safeModeExtensions = ! empty($event->settings['safe_mode_extensions']) ? $event->settings['safe_mode_extensions'] : '[]';
$safeModeExtensions = json_decode($event->settings['safe_mode_extensions'], true);
SychO9
approved these changes
May 18, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix setting key
safe_mode_extensionsnot existsFixes #0000
Changes proposed in this pull request:
Reviewers should focus on:
Screenshot
QA
Necessity
Confirmed
composer test).Required changes: